The additive quark model revisited - hadron and photon induced cross-sections