Modified class templates