Moved queuehandler to dataset from datasethandler