Restore missing NAMESPACE additions