Added tree-options support