Changed character enums to be ints