Changed AutoMapper to use pattern suggested by Sam (really Mark)