RK classes refactoring