Wired in AutoMapper and refactored.