Added a few more enums