Updated features to include updates from link module