Remove the need for an offline argument