enhanced close-class support