Improved LinkServiceProvider