Add more enum types