Introduce SIA special casing, with the possibility to amend and fix data flow