academ16 - metric matcher
manual id insertion added