Small program factory changes