Change ordering of database table creation