entity product refactor 1.3