fixed DI issues, new fields in Product