Added class templates