made mapping to a KeyValueContainer object optional (and false by default)