replace Struct with a simpler hack