Upgrade to CCA 0.5.0 closes #3