Expanded UserMap to a generic TieredMap