improve class support