Added work on scheduler