Add unlock and Session manager