ADEN-1290 Restructure SOI variables