Structural work and extensions

Structural work and extensions