Adding support for nested properties