added: classes and templates