Improved enum support