Progress on enum support