Options framework re-factoring + migration