entity product refactor 4.2