Fix args bug
Add support for global scope prefix