Fixed db setup/generator