Better handling of allowUpdate