Update to Properties Handling