Tweak control methods and add session-init