Added calendar and event models