Continue implementation of Session