Switching agent identification from AID to String