Update documentation; prepare Calender to be persistent