switch to structure based db setup