Changed session store from function map to protocol/types