Added templating classes