Tweaked skeleton to make more composable