Updated linking in Controllers