Improve timer scheduling