Fixed MapperInterface