entity product refactor 1.4