manage sessions

Change-Id: I0610c36ab6a32da71382471895b6b6e1ab606fc9