Adding rename support