Expanding CLI commands