Namespacing top level methods, bug fix.