Topic/plat 6085

Reworking of the links so that links are Joda immutable beans