Added support for folder renames