Some modifications to support last updates