Added server support and mock client support for sessions