entity product refactor 1.9