Consolidate the properties handling to the properties class.