Refactoring strategy + add error handling + auto reschedule when possible