Added CLI options support
Added CLI options support