Changed api for DefaultCalendar, changed Calendar in DefaultInstrument
to be modifiable