Extract DB functionality out
4 files changed