Adding survey management