class managements enhancements