Some clean up and better support for nested properties