Some changed for Linker