added cli options support