Feature/add scoutid support