Add enum and protocol to highlighting