Editted DatabaseManager