Added buffer-friendly maps and airline options.