Added fallback support