Sessions-related changes