Improvements on listeners