Add support for short file names