Implemented Add and Remove Listener functions