Improve terminal with session