Split storage fees into tiers, add Windows license fee