Add renaming support