Updated version, loading all templates