Adding linkresolver from refactor code