Core classes refactored