Moved the handling of the extra options for constructing a plan to the end of the constructor
Moved the handling of the extra options for constructing a plan to the end of the constructor

BillRun/system,BillRun/system,BillRun/system,BillRun/system