+ Add better template finder