added remote_id to be returned in return types