Corrected SQL Scripts, and fixed persistence issue.