Second round of DB changes