Rename enum and add two flags to make dispatching easier