[AdgModel] Added named pair support