updated interface and templates