Added fallback functionality for module switcher