Better internal options support