Improve event schedule