Added row ids now are really stored