Convert to use new Linker class interface