fixed datamodel to client