Support use_filename flag