Capitalised enums
Merge remote-tracking branch 'origin/master'
Added normalized names
Added Cache
Organized Imports