Updated to use Saxon HE