Changing Date map to Calendar