A couple of more things needs to change to accompany the 'gid' addition