Add remaining enums