Add basic options support