Added automatic JSON conversion