Refactor tiers