added missing mapper functionalities