Update, remove Session dep