More XML Security work
Modifying last commit