Introduce link types + cleanup