Add rename functionaility