Change Product Entity, add asserts