More classes refactored