HCOLL-268 refactored the JSON convertor