CDK-514: Use views

Any reason this is changed from DEBUG?