Added multiple file support