Bag.AddDir tested and working with downstream methods changes to make it work.