int ID -> String ID

Also moving to class Agency implementation