Hsoub/Extensions