implemented first version of link resolver