Restructuring latest additions (SQS)
Resolved merge conflicts (Cecile-Hardi)