Changed the way how properties are fetched and grouped from XML request