[V2] Resourcified roles

rebased #667.