Changed CreateMap overrides to use constructor in mappings.