Added enums support