Updated Enums up to Franks room