Removing the use of POJOs for JSON