changes in core for Map support