Add refs and use targeturi