multiple changes to support ironmq v3