Added some temporary classes