Prep for 8 byte enum support