Make more composable