Added some base structure