Struct changes