[CODE] Added some base classes