Merged Brian's changes to ContentMaps