Added missing mapper factory