Added calendar and graph structure