Adding options support