Added loc and event_time, related changes