Added multiple bundle file support