Moved match retrieval related methods into Match.