Added Listener
Added Manager