DB Proposed changes.

@jhladky Feel free to add additional proposals here. Everything looks good so far.