Changed order of database scripts, so that it runs