Added in XML configuration of models, no more hardcoding model parameters