Added factor mapper.