Merged in dashboard-db stuff