Initial code to support enum values