Add multi-file support