Continue rafactoring