Added support for long file names