removed mapper parent class and use the new mapper methods from the framework