Issue #189 - structured options support added.