SWITCHYARD-1547 - Updates for user group callback support