Updates to DB creation