some base classes was added