Feature/continue session implementation