Finishing up the db schema