Swapped to CCM for stacks and heap