Rework Consumer hierarchy etc.