Adding single file support