Update types to match enum refactor