[cli] Remove data option type and add new tagged option concept.