Added enum and enum with match statement for handling missing ints