Update Will's changes for new enums