Added bundle archieve support