Added CDEntity