Add fallback for undefined in enums
Some rename and add Bool