Added some basic stuff