Adding CDK features