Added geometric and negative binomial distribtions