Update session creation in order to support lion-client