Add location link key names to Link spec
Attempt method refactor