Extended the functionality for properties
Made the naming more consistent / clear