Added command line options support