Reworked map_standard