Adding options handler