added json mapper