Backend class refactoring