Big chunk of GSI support integrated #73