Double and Single message queue improvements