DGM-64 Queue per index and classname refactoring.