Added some base-classes