adding entity class to replace cb_object