Changes to accommodate updates to the DB which made it more normalized.