Moved mapper from sweetener project