Adding options functionality