Added the new info + match type fields. This will be revised at some point once PR 65 has been accepted