Updates to the enums + Models