Added support for nested properties

More tests + nested property support