Changes to yaptserver and session