Fixed class refactoring