update: Template class added lasted