Refactoring ADMapper