Updated with improved support of Netherlands map