implement enums in version 6.x

### Feature Request



|    Q        |   A
|------------ | ------
| New Feature | yes
| RFC         | no
| BC Break    | no

#### Summary

@MarioRadu  Please implement modifications from this PR  in the branch 6.x
in order to have this feature everywhere