Update with new GWTP 1.0.1 standard (replace obsolet code)
WIP links part