entity product refactor 1.6