Changed index to use queue table