Event scheduler changes