Added multi-dive import facility