Add scoping support

Good call, I'll do that.