entity product refactor 4.0