added c;elint_id adomain_id and cat_id at entoty level