finish up enum support