Make session as optionnal