Moving bundle import to HDS