Change routing to Commodity Manager first