Changed so both additive and multiplicative model is always calculated. Added more inheritance structures.