Fixed changes for  removal of id