add predicates & list separators
regenerate