Implemented new listener methods