Adding database persistence capabilities