Added linkage
TODO items