Updated to match namespaced code