Added some stuff from the 2D framework