Update for enum changes