Allow extra code into the enum and fix include