Updated for changes to enum.