Adding offline switch