Prevent data race when adding enum types

Prevent data race when adding enum types #829