Enabled improved structs and a few helpers.