Add super basic options support