Further multi-tier changes