Various updates
Add
Update to reflect db changes
Updates