Added support for renaming