Analytical extensions to the Gaussian Disorder Model for Organic Solar Cells