Improve get_events