New point for plugins and template fixes