Composing in latest Cornerstone