You're right, it could be. I might argue that wifi and mobile data should be move out of this file too. Keen to hear others thoughts on this.