Add custom class support