Adding rename and delete support.