including the Mapper in the Client