Updates to the DB structure (hopefully the last time)