Improvement in event args