Merge pull request #2336 from joto/enum-refactor #1329

Job	Run time
ubuntu-test-install (middle_schema)	2m 59s
ubuntu-test-install (public)	4m 8s
	7m 7s

Provide feedback