Update @extend call with !optional