added class support