Bugfix: Adapt CLI module to new API.