Updated to support changes to enums