Added multi-file support