Fixed multiple files support