Adding namespacing support