Options parser added
JSON argument removed