Adapted the Json classes