Initial work to support x.y.z

- Work to support x.y.z in management classes
- data-with started