Made things possible to add another mapper