Better linking and design improvements