Added some more to the base structure