Improved the seperation in Entity, Value and Json