Edited scope handling