Enabled extraction of listeners in finished demo example