Additional removed
Helpers
Enums fixed