Changed db setup