Added support for rename and move