Enabled the inclusion of additional constraints from the input data, the replacement of the objective function and the addition of new terms to the objective function. The basic file structure was also changed to better accommodate these.