JSON mapping

Change-Id: Ifbee04c6cf38bfde2f36a5691c8d112f882defe2
Unit tests

Change-Id: I3912b571f03fc3f26f2156bee34f53b59ed2dc36