Format + Change over to use the custom JSON parser for now