JSONEntity internal model modifications to allow for storing an entity's key