Few changes

New method : SetReplacementLink, but not implemented yet.
Refactoring of methods and few changes.