Add labelby support separate from roles