Included support for the new 'Extend' parameter.