More refactoring to class basis