Added suppport for multiple files