added map integration