Removed JsonFactory as it is no longer needed :P