Upgrade to JCPI 1.x