Added support to sub property.

* Should merge before merging "entity-reference".