Add some mapper work