Refactored tish to use linker sets