Added the proper DB calls