Update to use automatic-options