Add enums and structs