Adding Bonus to issue-203 upgrade SQL