change some base class from Entity to Base