[WIP] convert cli/maintenance to v2 data access