Add enums from manual
Made enums public
Unify enum naming
Unifying