api-tools added
api-tools adapted
Merge branch 'feature/cli-refactor' into develop