Updates to mail ite m model and event parser