Add fromOuterScope and listFromOuterScope