correcting the name of the class
including the requirements only if the service is enabled