Add in Atom getTermsSize, and fix in parser conflict not and Id
predicate (not_p)
Add Naf to aggregate