Namespacing issues resolved