Some fixes and improvements
Added schedule  and reschedule support