Merged (temporarily ?) key and session definitions.