Use Session in more places