Adding support for nested objects in properties