Converted all remaining status fields to enums