Updated Options Framework