Slight changes to map model