A small comment but since JobHistoryKeys is an enum, shouldn't we be able to use the switch statement instead of if's?