Changed to use PicketLink Extensions.