Fixes and changes for enabling adding properties.