Added possibility to choose the calendar