Backwards-compatible options support