added class for refactoring