Improve enums support