add part of the map support