I think we should use resource_id for consistency