Sprint 16, Issue 11: Database refactoring.