Added Confessor support