Added MapperStub