More consolidation of sym link functionality