Added Json mapping