added support of enums