Improve and ready task scheduler