Wrap more enums and structs
Add more enums and structs