Adjust addExtra to allow for no duplicate version and varying count.
Add containsNofaKind function.