Generalize solution so it also works with BK - all distributor specific values are moved to Constants system