8098808: Convert Scope from interface to class