Added in options support