Added Plan_Link and SortBy feature