Add predicates, remade variables and constants collections into maps
instead of ArrayLists of ArrayLists.