Update to Support system to handle My Data users