Add parsing of objects