Added some general stuff