Improved datamodel