Add registration options support