Fix required filename
Fix apply_extra_options to class method