Added mapper (didn't make it into the last one)