Namespace-based changes