Switching to a more efficient enum