WIP simplify config code
Make reading enum metadata more readable
Merge branch 'refactoring'
bump revision for further refactoring