Refactoring index mappers to use encapsulated Dimension classes