Implemented add new, rename