improve broadcasting support for element-map