Eliminated namespacing