Additional mappings, changed session behavior.