Fixed how templating works