ExtendedStage to template ExtendedStage<T>
Fix Wisper offset