Now builds maps for enums and structs