added command w/options support