Finish support for dynamic target selection