Added CustomJSONEncoder