Refactored subcategoy mappings