Add matching and ownership