Add ordering of groups and properties