Expanded the database and updated db related objects.