Added support for editing/renaming items