Move to periodic scheduler