Consolidate property definitions