Added scheduler wrapper