Added support for namespacing and import local files