Simplifying extraction of ERP options.
Refactored ERP creation to pass the options struct around, instead of decomposing it right away.