Added some class templates