Updated mapper, tests uncomplete