Discovering and adding targets