Support for scope, closes #444