Whitespace
More stubs for CLI