Edit mapper. Need testing it