Enum update and other changes