Added new components to linker