Add config for combined filenames
Clean-up