Added leave support and a notifying scheduler