Json conversion added and tested