Code improved for AbstractLink