Add STM Version of Struct class