Improved support for composable cli