Add class support
Fix: string constant support