Updated Options Framework to 1.8