Added support for custom_properties to ObjectProperties