Implement support for CLI commands (WIP)