Switch from using Tuples to the Directory Layer.