Change approach to optional `options` arguments in public methods