Add scoping support