diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
index 6c82a50f7..7b90f40b6 100644
--- a/beets/autotag/hooks.py
+++ b/beets/autotag/hooks.py
@@ -14,11 +14,14 @@
 
 """Glue between metadata sources and the matching logic."""
 import logging
+from collections import namedtuple
+
 from beets import plugins
 from beets.autotag import mb
 
 log = logging.getLogger('beets')
 
+
 # Classes used to represent candidate options.
 
 class AlbumInfo(object):
@@ -117,6 +120,11 @@ class TrackInfo(object):
         self.disctitle = disctitle
         self.artist_credit = artist_credit
 
+AlbumMatch = namedtuple('AlbumMatch', ['distance', 'info', 'mapping',
+                                       'extra_items', 'extra_tracks'])
+
+TrackMatch = namedtuple('TrackMatch', ['distance', 'info'])
+
 
 # Aggregation of sources.