Temporary fix for enums
Moved to correct position
Merge branch 'hotfix_enum' into feature_more-developer-friendly