Added links and link generators