Adding encounter management