Simplified class