Added some cmd parsing sections