Further integration of SimpleQueue