RAZ-2820: SMSB Requirements
Made update statements more robust