improving support for multiple files