Added all types as enum types