Keep namespace intact