[V2] Resourcified enumerations

rebased #724.