Improved Update validation