Further refactoring to use AuxiliaryDex