add $class to remove mapper interface