remote_id is PK now