Fixed namespacing issues