ClassBags features improvements