Edited namespace handling