Maps improval + tosync