Namespaces doesn't imply Expand anymore
Fix management of tail and checks on insertion