Add fact handling