Update: Target now coming from config if not present