Refactored classes (2)