Add structs and enums