Refactored events reponse