Match templates updated, implemented