Got rid of the JSON instances and json dependency