Added support for rename top level