Update to implement enums correctly

Signed-off-by: Dominic Baratta <dbaratta@buffalo.edu>