add adjustments for session extensibility