More by-hand work
Add an enum