Refactor and add events actions