Added template-classes