Adding support for multiple files