Added proper DB pointing