Rewrote enums to use strongly typed syntax