More EPL enum support