Added Area and Type to Events model