Made changes for km-link extensions.