added a queueStore and fixed loader methods