Allow scopes to be specified rather than regex for patterns
Misc clean up
Add update message