Fixed: Keep all main class methods