Refactored to AutoMapper.