Add explicit session handling to MappingHandler