Broke out tiers into a top level entity