+ Simplified class structure.