Add initial SQS support. Tidy up maps