Simplified class definition