Change Id to be reflected by Index