Add support for dynamic link locations