added map/unmap feature.