Added more fields to calendar view