Add only and except options support