Added some general stuff to the scheme