Improving handling for files with multiple namespaces