Updated version of FileBundle