entity product refactor 1.5