Added rename + delete functionality