Updates to FilenameFormatter