Add parsing of inner properties