Added support for filenames to include date