Add class SharedContextWindow and retain structure accordingly