Fix supplier add on the right context
Make consumer and supplier terms customizable
Move default_scope to base product