Few change and var renames in Logger and Session