Adds EntityFunctions and more EntityPredicates