Added support for GI role separation