Added support for scope prefixes, more logic
Fixed rendering bug