Added cmd arguments support.