Changes to resolve_interpeted_items