Add server side, for map testing