Apply enum fallbacks and validate… — Repository coding | OneNoughtOne