Added possibility to draw dots and shapes on the map