Templates logic has been updated