Update a couple of functions to define-namespace
More Readme