IMapper refactor; other updates