Adding support for command options(not completed.)