Database updates

Included remaining database/web service updates