Added ability to use scope prefix