change references to id:integer