Removed references to calendar tuples
Update types of calendar field in Currency