Integration listeners & bug fix