Added support to rename and unzip