entity product refactor 4.1