Moved JSON Conversion into the Engine away from the storage