Add Options support. Add preflight and core mode.