Added renaming support