Fixed namespaces issues