Added likelihood term generators for poisson and geometric