Further work on implementing enums