Numerous updates to make this work when namespaced