* Fix for calling right class in Service provider