entity product refactor 1.7