Namespace issues fixed