Updated Model to use JSON