Update for CDK 1.5.4