Added local database fallback