Rename id_ to id and create id property