Adding fallback capibilities