Adding yet more mapping options.