Classes refactored