adapted templates to new Core