More modifications to the property setup