Fixing issues for finding the right IMapper