Adding matching and disk advertisement