#22: added completed class support for objects