Added options support