Made linking optional