Fixed json mapping problem, updated docs