enum converter improvements