Change from service to scheduled task