Updated javadoc for new match-by-id and -class capabilities