Added screen_view and link_clicks models. Updated count measures for other event models