Changed framework to scheduler