Added mockery listeners