More database changes, preparing to create globally shared db object to ease inheritance in data layer