Can we move this logic to the system app?