Improve get events