Renamed entryId to id.