Make load update a bit more flexible