More workflow mapping additions