Updated for enum changes.