CDK-514: Use views