Manager & listener updated