Added rename and put functionality