modify MapSupport