Added Listener callback funcitonality