Remove some magic with session handler