Fixed support for CLI apps