improving create/rename/update/delete