Update listener matching and README