Made further changes to support extended results.