Improved on product datamodel