add manage options support