Mappers improved