Changed product datastore logic