Further changes to init_db