Added basic stuff to retrieve matches