Renamed the class and made the scope configurable